Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Sep 2011 15:57:06 +0000 (08:57 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Sep 2011 15:57:06 +0000 (08:57 -0700)
commitf49a135dac497642be9b201c205821a688475815
tree8a48ff635a76a67748754dd86b75408d7c7c1817
parentd2577f947e19503a7417a13edfd9d09b143169a6
parent07c774cb21ac8d290b3ad428eab70c3f2cc0b002
Merge from trunk.